Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 01:03:06 +0000 (01:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 01:03:06 +0000 (01:03 +0000)

Trivial merge